minor disable_with changes