fixes for XCode6 GM + cleanup