Some fixes for older Androids