FabriceSalvaire upgrade fixes