Fix passing client and project