Small changes to SpOcc and others