Fixes for android