Format and version fixes