minor fixes and send logs to diag service

Here you should also concat the two log entries.