Fix VANILLA-255, VANILLA-292, VANILLA-313 and VANILLA-317

build 3333 get!
Signed-off-by: Aleksi Sapon <QcTechs@gmail.com>