fixes after the merge