Small fixes

Andrea Zoppi