Minor gen fixes