Adjust paths to latest changes