SOS-1120

Fixes after source format