Update to use proper libs