Fix up the library generation