Fix some configure issues.