expression parser fixes