diff --git a/build-system/tasks/changelog.js b/build-system/tasks/changelog.js
index 2056a431f70b..848ae2528103 100644
--- a/build-system/tasks/changelog.js
+++ b/build-system/tasks/changelog.js
@@ -342,7 +342,7 @@ function getLastGitTag(gitMetadata) {
 
 /**
  * Runs `git log ${branch}...{tag} --pretty=oneline --first-parent`
- * @param {string} tag
+ * @param {!GitMetadataDef} gitMetadata
  * @return {!Promise<GitMetadataDef>}
  */
 function getGitLog(gitMetadata) {
@@ -409,7 +409,7 @@ function getGithubPullRequestsMetadata(gitMetadata) {
  * we will try and also fetch pulls/${id} first before fetching
  * pulls/${id}/files.
  *
- * @param {!GitMetadataDef}
+ * @param {!GitMetadataDef} gitMetadata
  * @return {!Promise<!GitMetadataDef>}
  */
 function getGithubFilesMetadata(gitMetadata) {
diff --git a/build-system/tasks/clean.js b/build-system/tasks/clean.js
index 2b50c923daca..d84845359da4 100644
--- a/build-system/tasks/clean.js
+++ b/build-system/tasks/clean.js
@@ -21,8 +21,6 @@ const gulp = require('gulp-help')(require('gulp'));
 
 /**
  * Clean up the build artifacts
- *
- * @param {function} done callback
  */
 function clean() {
   return del([
diff --git a/build-system/tasks/dep-check.js b/build-system/tasks/dep-check.js
index 21c2c29b535c..3c3d085bff92 100644
--- a/build-system/tasks/dep-check.js
+++ b/build-system/tasks/dep-check.js
@@ -55,7 +55,8 @@ let GlobDef;
 let GlobsDef;
 
 /**
- * @constructor @final @struct
+ * @class @final @struct
+ * @param {!RuleConfigDef} config
  */
 function Rule(config) {
   /** @private @const {!RuleConfigDef} */
@@ -212,7 +213,7 @@ function getEntryModule(extensionFolder) {
  * with nested dependencies. We flatten it so all we have are individual
  * modules and their imports as well as making the entries unique.
  *
- * @param {!ModuleDef} entryModule
+ * @param {!Array<!ModuleDef>} entryPoints
  * @return {!ModuleDef}
  */
 function flattenGraph(entryPoints) {
@@ -287,7 +288,7 @@ function toArrayOrDefault(value, defaultValue) {
 /**
  * Flatten array of arrays.
  *
- * @type {!Array<!Array>}
+ * @param {!Array<!Array>} arr
  */
 function flatten(arr) {
   return [].concat.apply([], arr);
diff --git a/build-system/tasks/get-zindex/index.js b/build-system/tasks/get-zindex/index.js
index 53d8329b3fac..a0fcb186be1a 100644
--- a/build-system/tasks/get-zindex/index.js
+++ b/build-system/tasks/get-zindex/index.js
@@ -84,7 +84,6 @@ function onFileThrough(file, enc, cb) {
 /**
  * @param {!Object<string, !Object<string, !Array<number>} filesData
  *    accumulation of files and the rules and z index values.
- * @param {function()} cb callback to end the stream
  * @return {!Array<!Array<string>>}
  */
 function createTable(filesData) {
@@ -107,6 +106,7 @@ function createTable(filesData) {
 
 
 /**
+ * @param {string} glob
  * @return {!Stream}
  */
 function getZindex(glob) {
diff --git a/build-system/tasks/prepend-global/index.js b/build-system/tasks/prepend-global/index.js
index 046540b80512..1538152a9ec9 100644
--- a/build-system/tasks/prepend-global/index.js
+++ b/build-system/tasks/prepend-global/index.js
@@ -100,8 +100,8 @@ function writeTarget(filename, fileString, opt_dryrun) {
 }
 
 /**
- * @param {string|boolean}
- * @param {string}
+ * @param {string|boolean} value
+ * @param {string} defaultValue
  * @return {string}
  */
 function valueOrDefault(value, defaultValue) {
diff --git a/gulpfile.js b/gulpfile.js
index e58ae4214672..7c736af6cbf9 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -644,7 +644,7 @@ function buildExtension(name, version, hasCss, options, opt_extraGlobs) {
 
 /**
  * @param {string} path
- * @param {string} css
+ * @param {string} name
  * @param {string} version
  * @param {!Object} options
  */
@@ -1295,6 +1295,7 @@ function buildWebPushPublisherFiles(options) {
 /**
  * Build amp-web-push publisher files HTML page.
  *
+ * @param {string} version
  * @param {!Object} options
  */
 function buildWebPushPublisherFilesVersion(version, options) {
@@ -1369,6 +1370,7 @@ function buildLoginDone(options) {
 /**
  * Build "Login Done" page for the specified version.
  *
+ * @param {string} version
  * @param {!Object} options
  */
 function buildLoginDoneVersion(version, options) {