Minor changes to library