Fix type locations