Pile of assorted fixes.