Fixed things Xcode 6 GM broke