Simple fixes in the library