Tweaks to library