Fix up some buggy data bootstrapping code