More parsing improvements