Minor fixes/clarifications