Fix generated files

Some quick optimizations