Improved CheckBox handling.