Fixes another bunch of parsing errors