data code fixes