Improve library checks
3 files changed