Small fixes per Trish