Minor bugfixes to allow retrospective testing to proceed