Fixed some issues with libraries