Added new fixes for iPad