Some paths fixes