Fixed Path Issues