Bugfixes in SHUN and CENSOR

Something doesn't seem right here...