Working to fix paths