Merge "Fix build warnings" into nyc-dev