Misc. minor changes.