More configure tweaks.