fix stuff that went missing during the rebase