Fixes for multi-sub-problem Y