library fixes