some fixes to make the rpc engine work again