Generator: Fixed compilation bugs ...