Fixes for android phones