Tweaks for iPad, removed deprecated methods