Merge "Fix first-time usage." into nyc-dev