More cleanup
Fix library paths