Bootstrapify everything; add missing field