Jon: Fixing up a few logging issues.