more fixes following last pull