Some more parsing improvements