Fix parser.
Remove some warnings