Ensure clean paths when jumping between buffers