Fix issues found after rebase