Import library fixes