Some fixes after testing
PLAT-486 #time 2h