Fix server side issues so app runs