Xcode stuff

Make Xcode 5 happier, make things more uniform