Fix paths.
Update more paths.