library fixes and location