More changes to get the library to build