[Fundamentals] Fixed $server with $::servername

I did not test this as I just switched back to $serverip which always
works. Please TEST this before merging