Improved replay path handling