Some minor changes to handling data.