iOS5 fixes