Fix up a few more places affected by the logging change

Signed-off-by: David Scott <dave.scott@eu.citrix.com>