quick fixes after merge