user parser fixes