minor fixes after the last commit