Fix client code finding