Fixed a couple of merge issues
iOS related notes