Fix issues with paths