[Parser] Fixed more bugs