Code changes to align with PlanB changes
Build changes.