Fixes for iPad