Some build, format and variable-type changes