Generation with fixes