Fix up logging to make more sense