SCALARIZR-1292 *Fix bugs