Fixed deps and collect issues.