generateRoundKey fixes