Bugfixes for devices running with newer API levels