fixes after merge of master