Path issue fixes