Fixes/corrections per Viktor emails