Touch up some library issues