Small protocol changes