minor parsing improvements