- Fixes for API level 35
