Include Andrea's many changes also in building

Ciao Domenico, as discussed. This includes also in building the many changes that I incorrectly submitted to master. I need this because like this I can send you further MRs ONLY to building (but I need building to have all my previous changes). Apologies for mixing this up! Andrea