VID-1308 fixing some stuff