Fixing log issues