Hotfixes on library issues #148 and #149