Minor fixes to last commit