Fixes for form-group.