Some fixes for paths.