Fix import errors post-rebase