Slight build configuration fixes.