Minor parsing improvements