Some Proximity fixes