Native Android fixes

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