Fixing up scaffold generator