Improvements for Android