Fixes bug introduced in 0ac8bf58 - Also note that setup functions no longer have access to server port. Will need to fix later.