Fixed Trilateration errors from merge