Code review update (and fix up logging to remove long paths)