Bug fixes associated with new data system.