Fixes for some random parsing tidbits.