fixes from Sole notes