Fix fm(un)register commands