fixes after merge of two very divergent branching -- shell adaptor ok again