More changes to conform to spec