Minor bugs required to get slocum running with the current
version of xray on the server.