Fixed dumb parsing bugs