Library updates
Bugfixes