fix errors that appeard after rebasing