minor fixes needed after last commit