minor fixes after merge with master