diff --git a/src/client.js b/src/client.js
index 8a397bb3f..e4ccb6839 100644
--- a/src/client.js
+++ b/src/client.js
@@ -751,7 +751,7 @@ MatrixClient.prototype.downloadKeys = function(userIds, forceDownload) {
  *
  * @param {string} userId the user to list keys for.
  *
- * @return {Promise<module:crypto-deviceinfo[]>} list of devices
+ * @return {Promise<module:crypto/deviceinfo[]>} list of devices
  */
 MatrixClient.prototype.getStoredDevicesForUser = async function(userId) {
     if (this._crypto === null) {
@@ -766,7 +766,7 @@ MatrixClient.prototype.getStoredDevicesForUser = async function(userId) {
  * @param {string} userId the user to list keys for.
  * @param {string} deviceId unique identifier for the device
  *
- * @return {Promise<?module:crypto-deviceinfo>} device or null
+ * @return {Promise<?module:crypto/deviceinfo>} device or null
  */
 MatrixClient.prototype.getStoredDevice = async function(userId, deviceId) {
     if (this._crypto === null) {
diff --git a/src/crypto/OlmDevice.js b/src/crypto/OlmDevice.js
index 872f5aa93..70f72df90 100644
--- a/src/crypto/OlmDevice.js
+++ b/src/crypto/OlmDevice.js
@@ -1110,7 +1110,7 @@ OlmDevice.prototype.decryptGroupMessage = async function(
  *
  * @param {string} roomId    room in which the message was received
  * @param {string} senderKey base64-encoded curve25519 key of the sender
- * @param {sring} sessionId session identifier
+ * @param {string} sessionId session identifier
  *
  * @returns {Promise<boolean>} true if we have the keys to this session
  */
diff --git a/src/crypto/olmlib.js b/src/crypto/olmlib.js
index b452f6d2c..aa224e9d3 100644
--- a/src/crypto/olmlib.js
+++ b/src/crypto/olmlib.js
@@ -123,7 +123,7 @@ export async function encryptMessageForDevice(
  * @param {object<string, module:crypto/deviceinfo[]>} devicesByUser
  *    map from userid to list of devices to ensure sessions for
  *
- * @param {bolean} force If true, establish a new session even if one already exists.
+ * @param {boolean} force If true, establish a new session even if one already exists.
  *     Optional.
  *
  * @return {module:client.Promise} resolves once the sessions are complete, to
diff --git a/src/http-api.js b/src/http-api.js
index 927947432..ba744b976 100644
--- a/src/http-api.js
+++ b/src/http-api.js
@@ -436,7 +436,7 @@ MatrixHttpApi.prototype = {
      * @param {Object=} queryParams A dict of query params (these will NOT be
      * urlencoded). If unspecified, there will be no query params.
      *
-     * @param {Object} data The HTTP JSON body.
+     * @param {Object} [data] The HTTP JSON body.
      *
      * @param {Object|Number=} opts additional options. If a number is specified,
      * this is treated as `opts.localTimeoutMs`.
@@ -518,7 +518,7 @@ MatrixHttpApi.prototype = {
      * @param {Object=} queryParams A dict of query params (these will NOT be
      * urlencoded). If unspecified, there will be no query params.
      *
-     * @param {Object} data The HTTP JSON body.
+     * @param {Object} [data] The HTTP JSON body.
      *
      * @param {Object=} opts additional options
      *
@@ -557,7 +557,7 @@ MatrixHttpApi.prototype = {
      * @param {Object=} queryParams A dict of query params (these will NOT be
      * urlencoded). If unspecified, there will be no query params.
      *
-     * @param {Object} data The HTTP JSON body.
+     * @param {Object} [data] The HTTP JSON body.
      *
      * @param {Object=} opts additional options
      *
diff --git a/src/models/event-timeline-set.js b/src/models/event-timeline-set.js
index 948f6c778..b681b66b8 100644
--- a/src/models/event-timeline-set.js
+++ b/src/models/event-timeline-set.js
@@ -830,7 +830,7 @@ EventTimelineSet.prototype.aggregateRelations = function(event) {
  *
  * @param {object} data  more data about the event
  *
- * @param {module:event-timeline.EventTimeline} data.timeline the timeline the
+ * @param {module:models/event-timeline.EventTimeline} data.timeline the timeline the
  * event was added to/removed from
  *
  * @param {boolean} data.liveEvent true if the event was a real-time event