Minor Adjustments for latest vNext versions.