Minor updates to library