Fixed (for real this time) server setup for non-local clients