Fixes for android api lvl17, (now works)