Fix log issues