Logging + Minor protocol changes