Fixed some iOS issues