Native Android fixes

I have one more Native Android feature left to do, but I'd quite like to get these changes in now.