Misc minor changes