Final tweaks to library core