HO-DirAC/HO-MASA merge improvements

Two improvements fixing imperfections that seem to come from different merges last days.