fixes on SDF2 generator