Miscellaneous minor cleanaps