Logs improvements