Fixing problems after rebase