contenttypes and tiny fixes in initial-data