A few changes to the libraries