Iterative fixes to make this work again after some rework on server side