Further fixes and clarifications