Fixes to work properly on iPad