Fixed RPC functions