Install generator fixes