fixes for android callbacks