Fix path and deps