more break3 fixes