Fix for updated logging messages