Emergency server improvements