Final ipad fixes