misc fixes to last commit