SOS-1138 Fix errors from SF