Fixes for Android after recent commits.