Fix callbacks for shell client