last fixes before full move to so1.3