Fixes for Gordeev's company