Fix up from rebase