Resolve some spec errors, and update schema to include cherry picks