Fix up the logging issues due to swagger RC