Even more server connection improvements!