Fix canonical server handling