Major version upgrade: shortened fields, debugged bootstrap