Fix a few bugs with user parameters