Fixed paths to work in-place