Message format spec fixes, commit no. 4