Small fixes per Fidi's list