more android 2.3 fixes