Logging fix

Should fix build failures, please review