pkg/client: some more wkfs usage

Change-Id: Ib4098304beb52492e1b62bfeb88962c9d4095c0d