Little fixes to last commit