diff --git a/src/Model/Event.php b/src/Model/Event.php
index ecf21d3420..6f77832209 100644
--- a/src/Model/Event.php
+++ b/src/Model/Event.php
@@ -344,7 +344,6 @@ class Event
 		$event['id'] = $event_id;
 
 		$item['uid']           = $event['uid'];
-		$item['contact-id']    = $event['cid'];
 		$item['uri']           = $event['uri'];
 		$item['uri-id']        = ItemURI::getIdByURI($event['uri']);
 		$item['guid']          = $event['guid'];
@@ -363,11 +362,10 @@ class Event
 		$item['allow_gid']     = $event['allow_gid'];
 		$item['deny_cid']      = $event['deny_cid'];
 		$item['deny_gid']      = $event['deny_gid'];
-		$item['private']       = intval($event['private'] ?? 0);
+		$item['private']       = $event['allow_cid'] && $event['allow_gid'] && $event['deny_cid'] && $event['deny_gid'] ? 0 : 1;
 		$item['visible']       = 1;
 		$item['verb']          = Activity::POST;
 		$item['object-type']   = Activity\ObjectType::EVENT;
-		$item['post-type']     = Item::PT_EVENT;
 		$item['origin']        = $event['cid'] === 0 ? 1 : 0;
 		$item['body']          = self::getBBCode($event);
 		$item['event-id']      = $event['id'];
@@ -547,8 +545,8 @@ class Event
 		// Query for the event by event id
 		$events = DBA::toArray(DBA::p(
 			"SELECT `event`.*, `post-user`.`id` AS `itemid` FROM `event`
-			LEFT JOIN `post-user` 
-				ON `post-user`.`event-id` = `event`.`id` 
+			LEFT JOIN `post-user`
+				ON `post-user`.`event-id` = `event`.`id`
 				AND `post-user`.`uid` = `event`.`uid`
 			WHERE `event`.`id` = ?
 			  AND `event`.`uid` = ?
@@ -932,9 +930,9 @@ class Event
 
 		// Construct the profile link (magic-auth).
 		$author       = [
-			'uid'     => 0, 
+			'uid'     => 0,
 			'id'      => $item['author-id'],
-			'network' => $item['author-network'], 
+			'network' => $item['author-network'],
 			'url'     => $item['author-link'],
 			'alias'   => $item['author-alias']
 		];
diff --git a/src/Model/Mail.php b/src/Model/Mail.php
index a6cb8a0780..78dd6329ce 100644
--- a/src/Model/Mail.php
+++ b/src/Model/Mail.php
@@ -233,7 +233,7 @@ class Mail
 				foreach ($images as $image) {
 					$image_rid = Photo::ridFromURI($image);
 					if (!empty($image_rid)) {
-						Photo::update(['allow-cid' => '<' . $recipient . '>'], ['resource-id' => $image_rid, 'album' => 'Wall Photos', 'uid' => $sender_uid]);
+						Photo::update(['allow_cid' => '<' . $recipient . '>'], ['resource-id' => $image_rid, 'album' => 'Wall Photos', 'uid' => $sender_uid]);
 					}
 				}
 			}