Changes to suppress Xcode warnings