Minor revisions for latest Xcode (6)