Fixed Ios issues