fixing class defines for logging