Fixes for radio and checkbox elements