[DCOSS] just a couple more fixes. More compact diagram.