minor fixes for last commit