Bug fixes on data structures.