Configure script fixes.