Fix NPE
More replay fixes
Fix pipeline all the way