[Parser] More minor updates