A selection of small cleanups