Swc-1807, SWC-1803

fixes build