Further fixes for legacy products