diff --git a/BUILD.md b/BUILD.md
index 63c1d71e5..905512b48 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -28,6 +28,8 @@ yarn dist
 
 If there's an error `while loading shared libraries: libgconf-2.so.4: cannot open shared object file: No such file or directory`, run `sudo apt-get install libgconf-2-4`
 
+For node-gyp to work, you might need to install the `windows-build-tools` using `npm install --global windows-build-tools`.
+
 That will create the executable file in the `dist` directory.
 
 From `/ElectronClient` you can also run `run.sh` to run the app for testing.
diff --git a/CliClient/publish.sh b/CliClient/publish.sh
index 91e19d64e..a45d4456d 100755
--- a/CliClient/publish.sh
+++ b/CliClient/publish.sh
@@ -9,4 +9,10 @@ bash $SCRIPT_DIR/build.sh
 cp "$SCRIPT_DIR/package.json" build/
 cp "$SCRIPT_DIR/../README.md" build/
 cd "$SCRIPT_DIR/build"
-npm publish
\ No newline at end of file
+npm publish
+
+NEW_VERSION=$("cat package.json | jq -r .version")
+git add -A
+git commit -m "CLI v$NEW_VERSION"
+git tag "cli-v$NEW_VERSION"
+git push && git push --tags
\ No newline at end of file
diff --git a/ReactNativeClient/lib/models/BaseItem.js b/ReactNativeClient/lib/models/BaseItem.js
index 0619b785a..51bb65204 100644
--- a/ReactNativeClient/lib/models/BaseItem.js
+++ b/ReactNativeClient/lib/models/BaseItem.js
@@ -611,7 +611,7 @@ class BaseItem extends BaseModel {
 				SELECT id
 				FROM %s
 				WHERE encryption_applied = 0`,
-				this.db().escapeField(ItemClass.tableName()),
+				this.db().escapeField(ItemClass.tableName())
 			);
 
 			const items = await ItemClass.modelSelectAll(sql);