Bit more generation changes. Nothing major.