Fix crashes on Android 2.2.2
Fix HH issue on older devices