iOS specific bug fixing