Made both servers optional and SUID.