More Xcode 4 compatibility fixes