Fix Path (and build)