minor fixes after last push