Made a few changes to the autogen stuff