Fix to config macros for changes in the class cuts (Kishora)