fixes to span/segment definitions