Fix server side issues