diff --git a/internal/authentication/token.go b/internal/authentication/token.go
index 6edda01..73ea007 100644
--- a/internal/authentication/token.go
+++ b/internal/authentication/token.go
@@ -7,7 +7,7 @@ import (
 
 var (
 	tokenCharacters        = []byte("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789")
-	regularTokenLength     = 64 // This length includes the prefix (one character).
+	regularTokenLength     = 63 // This length includes the prefix (one character).
 	compatTokenLength      = 15 // This length includes the prefix (one character).
 	applicationTokenPrefix = "A"
 )
diff --git a/internal/dispatcher/application.go b/internal/dispatcher/application.go
index 56fd41c..4e27034 100644
--- a/internal/dispatcher/application.go
+++ b/internal/dispatcher/application.go
@@ -45,7 +45,7 @@ func (d *Dispatcher) DeregisterApplication(a *model.Application, u *model.User)
 
 	if _, err := d.mautrixClient.KickUser(mId.RoomID(a.MatrixID), &mautrix.ReqKickUser{
 		Reason: "This application was deleted",
-		UserID: mId.UserID(a.MatrixID),
+		UserID: mId.UserID(u.MatrixID),
 	}); err != nil {
 		log.Print(err)
 		return err
diff --git a/internal/dispatcher/dispatcher.go b/internal/dispatcher/dispatcher.go
index 26acdf0..577c837 100644
--- a/internal/dispatcher/dispatcher.go
+++ b/internal/dispatcher/dispatcher.go
@@ -27,7 +27,7 @@ func Create(homeserver, username, password string, formatting configuration.Form
 		Type:             mautrix.AuthTypePassword,
 		Identifier:       mautrix.UserIdentifier{Type: mautrix.IdentifierTypeUser, User: username},
 		Password:         password,
-		DeviceID:         id.DeviceID("my-device"), // TODO make device ID configurable
+		DeviceID:         id.DeviceID("pushbits"),
 		StoreCredentials: true,
 	})
 	if err != nil {
diff --git a/internal/dispatcher/notification.go b/internal/dispatcher/notification.go
index 0f94aa6..aa1c077 100644
--- a/internal/dispatcher/notification.go
+++ b/internal/dispatcher/notification.go
@@ -259,27 +259,15 @@ func (d *Dispatcher) respondToMessage(a *model.Application, body, formattedBody
 
 // Extracts body and formatted body from a matrix message event
 func bodiesFromMessage(message *event.Event) (body, formattedBody string, err error) {
-	if val, ok := message.Content.Raw["body"]; ok {
-		body, ok := val.(string)
-
-		if !ok {
-			return "", "", pberrors.ErrorMessageNotFound
-		}
-
-		formattedBody = body
-
-	} else {
+	msgContent := message.Content.AsMessage()
+	if msgContent == nil {
 		return "", "", pberrors.ErrorMessageNotFound
 	}
 
-	if val, ok := message.Content.Raw["formatted_body"]; ok {
-		body, ok := val.(string)
-		if !ok {
-			return "", "", pberrors.ErrorMessageNotFound
-		}
-
-		formattedBody = body
+	formattedBody = msgContent.FormattedBody
+	if formattedBody == "" {
+		formattedBody = msgContent.Body
 	}
 
-	return body, formattedBody, nil
+	return msgContent.Body, formattedBody, nil
 }