Performed fixes suggested by Xcode 6