CONN-610: fixes for EventLogging-Standard.