Fixes for android 4.4.3