Fix origin problems.