Fix subscription messages and code comments