A bunch of unrelated fixits (see individual commits)