Fixing server with non-gdm, now supporting multiple local servers