Misc bits

I'll check when I get home.