Some minor changes to iOS client. Not sure the diff as the code got stale before commit. Whoops.