diff --git a/.travis.yml b/.travis.yml
index 74ecb4e89f..441c32e942 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - '10.13.0'
+  - '12.4.0'
 os:
   - linux
 dist: trusty
@@ -13,7 +13,7 @@ script:
   - yarn lint
   - yarn lint-deps
   - yarn prepare-beta-build
-  - $(yarn bin)/build --config.extraMetadata.environment=$SIGNAL_ENV --config.mac.bundleVersion='$TRAVIS_BUILD_NUMBER' --publish=never --config.directories.output=release
+  - $(yarn bin)/electron-builder --config.extraMetadata.environment=$SIGNAL_ENV --config.mac.bundleVersion='$TRAVIS_BUILD_NUMBER' --publish=never --config.directories.output=release
   - ./travis.sh
 env:
   global:
diff --git a/appveyor.yml b/appveyor.yml
index 0f76883519..70ec34913d 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -8,7 +8,7 @@ cache:
 install:
   - systeminfo | findstr /C:"OS"
   - set PATH=C:\Ruby23-x64\bin;%PATH%
-  - ps: Install-Product node 10.13.0 x64
+  - ps: Install-Product node 12.4.0 x64
   - ps: .\build\install-yarn.ps1
   - yarn install --frozen-lockfile
 
@@ -21,7 +21,7 @@ build_script:
   - type package.json | findstr /v certificateSubjectName > temp.json
   - move temp.json package.json
   - yarn prepare-beta-build
-  - node_modules\.bin\build --config.extraMetadata.environment=%SIGNAL_ENV% --publish=never --config.directories.output=release
+  - node_modules\.bin\electron-builder --config.extraMetadata.environment=%SIGNAL_ENV% --publish=never --config.directories.output=release
 
 test_script:
   - node build\grunt.js test
diff --git a/ts/state/ducks/conversations.ts b/ts/state/ducks/conversations.ts
index 69f761133d..965a7b4a34 100644
--- a/ts/state/ducks/conversations.ts
+++ b/ts/state/ducks/conversations.ts
@@ -15,7 +15,7 @@ import {
   AttachmentType,
   isImageAttachment,
   isVideoAttachment,
-} from '../../types/attachment';
+} from '../../types/Attachment';
 
 // State