Fixed up some client code.