Merge "Fix minor bugs:" into nyc-dev