Hotfixes on libraries issues #148 and #149