diff --git a/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/PayloadParserImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/PayloadParserImpl.java
index d41cffa99..6715faf3c 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/PayloadParserImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/keyagreement/PayloadParserImpl.java
@@ -73,7 +73,7 @@ class PayloadParserImpl implements PayloadParser {
 		List<TransportDescriptor> recognised = new ArrayList<>();
 		for (int i = 1; i < payload.size(); i++) {
 			BdfList descriptor = payload.getList(i);
-			long transportId = descriptor.getLong(0);
+			int transportId = descriptor.getInt(0);
 			if (transportId == TRANSPORT_ID_BLUETOOTH) {
 				TransportId id = BluetoothConstants.ID;
 				recognised.add(new TransportDescriptor(id, descriptor));
diff --git a/bramble-core/src/test/java/org/briarproject/bramble/plugin/tcp/LanTcpPluginTest.java b/bramble-core/src/test/java/org/briarproject/bramble/plugin/tcp/LanTcpPluginTest.java
index 6a890e33c..8c41437e4 100644
--- a/bramble-core/src/test/java/org/briarproject/bramble/plugin/tcp/LanTcpPluginTest.java
+++ b/bramble-core/src/test/java/org/briarproject/bramble/plugin/tcp/LanTcpPluginTest.java
@@ -217,7 +217,7 @@ public class LanTcpPluginTest extends BrambleTestCase {
 		// The plugin should have bound a socket and stored the port number
 		BdfList descriptor = kal.getDescriptor();
 		assertEquals(3, descriptor.size());
-		assertEquals(TRANSPORT_ID_LAN, descriptor.getLong(0).longValue());
+		assertEquals(TRANSPORT_ID_LAN, descriptor.getInt(0).intValue());
 		byte[] address = descriptor.getRaw(1);
 		InetAddress addr = InetAddress.getByAddress(address);
 		assertTrue(addr instanceof Inet4Address);
diff --git a/briar-core/src/main/java/org/briarproject/briar/avatar/AvatarValidator.java b/briar-core/src/main/java/org/briarproject/briar/avatar/AvatarValidator.java
index 30ec7cb37..1ad955703 100644
--- a/briar-core/src/main/java/org/briarproject/briar/avatar/AvatarValidator.java
+++ b/briar-core/src/main/java/org/briarproject/briar/avatar/AvatarValidator.java
@@ -76,7 +76,7 @@ class AvatarValidator implements MessageValidator {
 		// 0.0: Message Type, Version, Content-Type
 		checkSize(body, 3);
 		// Message Type
-		long messageType = body.getLong(0);
+		long messageType = body.getInt(0);
 		if (messageType != MSG_TYPE_UPDATE) throw new FormatException();
 		// Version
 		long version = body.getLong(1);
diff --git a/briar-core/src/main/java/org/briarproject/briar/privategroup/PrivateGroupManagerImpl.java b/briar-core/src/main/java/org/briarproject/briar/privategroup/PrivateGroupManagerImpl.java
index ff4825c0c..088cbc4ce 100644
--- a/briar-core/src/main/java/org/briarproject/briar/privategroup/PrivateGroupManagerImpl.java
+++ b/briar-core/src/main/java/org/briarproject/briar/privategroup/PrivateGroupManagerImpl.java
@@ -366,7 +366,7 @@ class PrivateGroupManagerImpl extends BdfIncomingMessageHook
 			// parse the metadata
 			for (Entry<MessageId, BdfDictionary> entry : metadata.entrySet()) {
 				BdfDictionary meta = entry.getValue();
-				if (meta.getLong(KEY_TYPE) == JOIN.getInt()) {
+				if (meta.getInt(KEY_TYPE) == JOIN.getInt()) {
 					headers.add(getJoinMessageHeader(txn, g, entry.getKey(),
 							meta, authorInfos));
 				} else {