More fixes to library.