fix up errors caused by rebase