More fixes. Perfecting phase