Merge "Fix locations at environment uses."