diff --git a/lib/content-repo.js b/lib/content-repo.js
index 480f940c0..dfc49ea27 100644
--- a/lib/content-repo.js
+++ b/lib/content-repo.js
@@ -1,3 +1,6 @@
+/**
+ * @module content-repo
+ */
 var utils = require("./utils");
 
 module.exports = {
diff --git a/lib/matrix.js b/lib/matrix.js
index c49444afa..9a4e3e729 100644
--- a/lib/matrix.js
+++ b/lib/matrix.js
@@ -30,6 +30,8 @@ module.exports.MatrixScheduler = require("./scheduler");
 module.exports.WebStorageSessionStore = require("./store/session/webstorage");
 /** True if crypto libraries are being used on this client. */
 module.exports.CRYPTO_ENABLED = require("./client").CRYPTO_ENABLED;
+/** {@link module:content-repo|ContentRepo} utility functions. */
+module.exports.ContentRepo = require("./content-repo");
 
 /**
  * Create a new Matrix Call.
diff --git a/lib/models/room-member.js b/lib/models/room-member.js
index b836fc2be..a57f23b1e 100644
--- a/lib/models/room-member.js
+++ b/lib/models/room-member.js
@@ -150,7 +150,8 @@ RoomMember.prototype.getLastModifiedTime = function() {
 
 /**
  * Get the avatar URL for a room member.
- * @param {string} baseUrl The base homeserver URL
+ * @param {string} baseUrl The base homeserver URL See
+ * {@link module:client~MatrixClient#getHomeserverUrl}.
  * @param {Number} width The desired width of the thumbnail.
  * @param {Number} height The desired height of the thumbnail.
  * @param {string} resizeMethod The thumbnail resize method to use, either
diff --git a/lib/models/room.js b/lib/models/room.js
index 475d5e365..4347b5493 100644
--- a/lib/models/room.js
+++ b/lib/models/room.js
@@ -42,7 +42,8 @@ utils.inherits(Room, EventEmitter);
 
 /**
  * Get the avatar URL for a room if one was set.
- * @param {String} baseUrl The homeserver base URL. See {@link MatrixClient#getHomeserverUrl()}.
+ * @param {String} baseUrl The homeserver base URL. See
+ * {@link module:client~MatrixClient#getHomeserverUrl}.
  * @param {Number} width The desired width of the thumbnail.
  * @param {Number} height The desired height of the thumbnail.
  * @param {string} resizeMethod The thumbnail resize method to use, either