Fixed log issues