euclid related fixes