More bootstrap format checking