fix problems after rebase