Modified minor parsing bugs