More configure tweaks