More playtest regression fixes.