Clean up and fixes for issues when starting with no data.