Fixing up logging changes