Minor fixes related to parsing of radio button groups etc.