Library tweaks