Misc minor fixex.