Fixes for platform android-21