Some more bug fixes for new capture / replay