Fixes to work with the current versino of the lib