PH: Pushing up fix for logging and whatnot