Other fixes by Giacinto