Fix server install issues again