Minor fixes

Andrea Zoppi