Improve old chmplain workarounds