Be a little smart about path changes