Fixes for CE and ERT fireproof settings