config class cr fixes