Bugfixes in SHUN and CENSOR