Fixes for android level < 11