Fix paths.
Clean up.