Fixing server things