Improved system libraries (thanks @gregwebs)