Minor fixes

Andrea Zoppi
Minor fixes

Andrea Zoppi
Minor changes

Andrea Zoppi