Various fixes to my own stuff.