more fixes from last comments