Fix some build settings