Added android specific workarounds