Fix downstream packages