Fix issues after rebase with master