Fix install and initial data issues