Misc minor changes.