Fixes to downloader and replayer