Fix path dependencies, still looking for complete method