Some sweeper work and a fix for publishing declared SRS