Minor tweaks (I think) for Xcode 4.6.1