Fix issues with checkboxes