Further fixes to make all this work