various configure fixes