Misc. small cleanup