Some fixes with loading this library