Fixed dependencies and paths