Some small fixes, onward!

These checkin changes are going to be trivial because it's just fixing up machine translated code. Not much to say about that until we get it working.