pathtools: Some fixes.