Fixes for Xcode