small fixes to last commit