more break address fixes