Server initiate fixes