Fixed minor parsing bugs