Android1 1fixup

This is a few small cleanups for the Android 1.1 release.