minor fixes after last PR