More decent path handling