More initial-data fixes