Minor generation updates.