Fixing a few more data issues (stability problems).