SCALARIZR-1170 *Fix some code