(iOS/OSX) Build fixes