Fixed variable references in plan and profiles