Attempt at fixing some server issues