Additional XCode5 changes

Additional optimizations.