[PLAT-3558] Fudge builders and bug fixes for SimulationTool etc