More changes for Android