Fixing server errors

Follow