A few fixes and clarifications