Fix build after rebase to master