More robust path handling