Fix up the logging and the build issue