RadioButton fixes