Dodgy installer fixups