Tweaks in lib