initial data fixes