870403 - Fix all server responses to pass args in correct order