Data and fixes found in testing