Fix Fred to work with current master.