- Some more changes for Android compatibility