- Fixed some library issues