Fix RPC and HTTP API for new command set