Fill in functions axed during rebase