Fixed parsing bugs.