[Parser] More fixes