generation adjustments/fixes