Minor fixes before pubblication