Misc. cleanup.