Temp. fixes to run the server