Fixing up the library