Misc fixes/changes