Fixed anumber of iOS issues