Various fixes and clarifications