Fix checkboxes and radio buttons