Further fixes to a fix