Fixes for older Android versions