Generator templates corrections