Changes to make RPC shitty shit work