Fix library issues