Initial data fixes