fixes after merge with master