diff --git a/briar-android-tests/src/test/java/org/briarproject/ForumManagerTest.java b/briar-android-tests/src/test/java/org/briarproject/ForumManagerTest.java
index b1824191d41afe6c40f0116b27165f94165f9341..1714a49ea9b6861671d83be2e1313cbbe423262c 100644
--- a/briar-android-tests/src/test/java/org/briarproject/ForumManagerTest.java
+++ b/briar-android-tests/src/test/java/org/briarproject/ForumManagerTest.java
@@ -354,7 +354,7 @@ public class ForumManagerTest {
 				author0.getId(), master, clock.currentTimeMillis(), true,
 				true
 		);
-		// invitee adds sharers back
+		// invitee adds sharer back
 		contactId0 = contactManager1.addContact(author0,
 				author1.getId(), master, clock.currentTimeMillis(), true,
 				true
diff --git a/briar-core/src/org/briarproject/db/Database.java b/briar-core/src/org/briarproject/db/Database.java
index 2fbd55f4ac8523571f361b3e8df105691a90fe56..779e73722f798096b9e89918139ab6cd234c68ef 100644
--- a/briar-core/src/org/briarproject/db/Database.java
+++ b/briar-core/src/org/briarproject/db/Database.java
@@ -329,7 +329,9 @@ interface Database<T> {
 	/**
 	 * Returns the dependencies of the given message.
 	 * This method makes sure that dependencies in different groups
-	 * are returned as {@link ValidationManager.State.INVALID}.
+	 * are returned as {@link ValidationManager.State.INVALID}. Note that this
+	 * is not set on the dependencies themselves; the returned states should
+	 * only be taken in the context of the given message.
 	 * <p/>
 	 * Read-only.
 	 */
@@ -468,14 +470,14 @@ interface Database<T> {
 	void lowerRequestedFlag(T txn, ContactId c, Collection<MessageId> requested)
 			throws DbException;
 
-	/*
+	/**
 	 * Merges the given metadata with the existing metadata for the given
 	 * group.
 	 */
 	void mergeGroupMetadata(T txn, GroupId g, Metadata meta)
 			throws DbException;
 
-	/*
+	/**
 	 * Merges the given metadata with the existing metadata for the given
 	 * message.
 	 */
@@ -577,7 +579,7 @@ interface Database<T> {
 	void setMessageState(T txn, MessageId m, State state)
 			throws DbException;
 
-	/*
+	/**
 	 * Adds a dependency between two MessageIds
 	 */
 	void addMessageDependency(T txn, MessageId dependentId,