Fixes for checkboxes with new ZAT