Bugfixes in SHUN and CENSOR

I still don't get this.