Fixed references after rebase