Minor protocol changes