Minor fixes, license year updated

Andrea Zoppi