Minor updates
PLAT-974 #time 5m