Minor fixes for modern Xcode versions