Bug fixes for paths.