Minor updates for Android