changes to compile in xcode 6b6