fixes after rebasing