[5-to-6] small fixes and clarifications