fixes for android 2.3