Fix some of the server helpers