bug fixes with rpc calls