Fixes to compile under latest iOS pass #1