Additional enterprise compatibiilty
Add basic system config fields and improve "do no harm" if disabled