Fix make_extras