Fix generation scripts