minor fixes after merge