Fixes bunches of parsing errors