Fixup after runthrough