Labeled breaks

Code review fixes