Small fixes to last commit