Maybe fixes RPCs. Debugging code needs removal.