Transfer over some client helper methods from SC2