Generation fixes