Merge "Minor improvements useful for debugging." into nyc-dev