Improvements for Android Q and 11
