Further fixes and refinements