Fixed serialization problems with Authenticators (#417 and #416)