freeze some configurations and fixup some regexp references