Fixed Android 2.2 compability issues