dependency fix and path correction