Fixing reference errors in `client` methods, fixes #35 (needs to be built)