Some hotfixes to the distributed_ep