small fixes before last commit