misc fixes after merge