DataStructures fixes