diff --git a/package.json b/package.json
index 7be326322..c1a14f5c8 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,7 @@
     "@angular/platform-browser": "4.1.3",
     "@angular/platform-browser-dynamic": "4.1.3",
     "@angular/router": "4.1.3",
-    "@blackbaud/stache": "2.0.0-beta.2",
+    "@blackbaud/stache": "2.0.0-beta.3",
     "core-js": "2.4.1",
     "dragula": "3.7.2",
     "font-awesome": "4.7.0",
diff --git a/scripts/visual-baseline.sh b/scripts/visual-baseline.sh
index 7d5c58ef9..36c624bd6 100644
--- a/scripts/visual-baseline.sh
+++ b/scripts/visual-baseline.sh
@@ -15,7 +15,7 @@ if [[ "$TRAVIS_PULL_REQUEST" == "false" && ! $TRAVIS_BRANCH =~ $SAVAGE_BRANCH ]]
   if [ -z "$(git ls-files --others --exclude-standard)" ]; then
     echo -e "No changes to commit to skyux2."
   else
-    git add webdriver-screenshots/
+    git add skyux-spa-visual-tests/screenshots-baseline/
     git commit -m "Travis build $TRAVIS_BUILD_NUMBER pushed to skyux2 [ci skip]"
     git push -fq origin $TRAVIS_BRANCH > /dev/null
     echo -e "skyux2 successfully updated.\n"
diff --git a/skyux-spa-visual-tests/package.json b/skyux-spa-visual-tests/package.json
index 38a213f01..18c5766c6 100644
--- a/skyux-spa-visual-tests/package.json
+++ b/skyux-spa-visual-tests/package.json
@@ -19,7 +19,7 @@
   "license": "ISC",
   "devDependencies": {
     "@blackbaud/skyux-builder": "blackbaud/skyux-builder#update-angular",
-    "@blackbaud/skyux": "blackbaud/skyux2#ng4-upgrade",
+    "@blackbaud/skyux": "blackbaud/skyux2#rc-ng4-upgrade",
     "codelyzer": "3.0.1",
     "moment": "2.18.1",
     "dragula": "3.7.2",
diff --git a/skyux-spa-visual-tests/src/app/page-summary/page-summary-visual.component.ts b/skyux-spa-visual-tests/src/app/page-summary/page-summary-visual.component.ts
index 3cc896408..24b1311f8 100644
--- a/skyux-spa-visual-tests/src/app/page-summary/page-summary-visual.component.ts
+++ b/skyux-spa-visual-tests/src/app/page-summary/page-summary-visual.component.ts
@@ -23,6 +23,8 @@ export class PageSummaryVisualComponent {
 
   public showKeyInfo = false;
 
+  [key: string]: boolean | string;
+
   public get itemsToShow(): string {
     return this._itemsToShow;
   }
diff --git a/skyux-spa-visual-tests/src/app/search/search-visual.component.ts b/skyux-spa-visual-tests/src/app/search/search-visual.component.ts
index 18579c4e6..89a58d5b3 100644
--- a/skyux-spa-visual-tests/src/app/search/search-visual.component.ts
+++ b/skyux-spa-visual-tests/src/app/search/search-visual.component.ts
@@ -10,7 +10,7 @@ export class SearchVisualComponent {
   public displayedItems: any;
   public searchText: string;
 
-  private items = [
+  private items: Array<any> = [
     {
       title: 'Call Robert Hernandez',
       note: 'Robert recently gave a very generous gift. We should call to thank him.'
@@ -43,7 +43,7 @@ export class SearchVisualComponent {
     if (searchText) {
       filteredItems = this.items.filter(function (item) {
           let property: any;
-          for (property in item) {
+          for (property in item as any) {
               if (item.hasOwnProperty(property) && (property === 'title' || property === 'note')) {
                   /* tslint:disable */
                   if (item[property].indexOf(searchText) > -1) {
diff --git a/skyuxconfig.json b/skyuxconfig.json
index 029531475..593d15a56 100644
--- a/skyuxconfig.json
+++ b/skyuxconfig.json
@@ -5,7 +5,6 @@
   "cssPath": "src/scss/sky.scss",
   "compileMode": "aot",
   "plugins": [
-    "@blackbaud/skyux-builder-plugin-stache-code-block",
-    "@blackbaud/skyux-builder-plugin-stache-include"
+    "@blackbaud/skyux-builder-plugin-stache"
   ]
 }
diff --git a/src/app/app-extras.module.ts b/src/app/app-extras.module.ts
index fefad4798..72838aab3 100644
--- a/src/app/app-extras.module.ts
+++ b/src/app/app-extras.module.ts
@@ -1,8 +1,7 @@
 import { NgModule } from '@angular/core';
 
-import { StacheModule, StacheConfigService } from'@blackbaud/stache';
+import { StacheModule } from'@blackbaud/stache';
 
-import { SkyAppConfig } from '@blackbaud/skyux-builder/runtime';
 import { SkyDemoTitleService } from './shared/title.service';
 import { SkyFilterDemoModalComponent } from './components/filter/filter-demo-modal.component';
 import { SkyListFiltersModalDemoComponent }
@@ -34,11 +33,7 @@ require('style-loader!./styles.scss');
     StacheModule
   ],
   providers: [
-    SkyDemoTitleService,
-    {
-      provide: StacheConfigService,
-      useExisting: SkyAppConfig
-    }
+    SkyDemoTitleService
   ]
 })
 export class AppExtrasModule { }
diff --git a/src/modules/text-expand/text-expand.component.ts b/src/modules/text-expand/text-expand.component.ts
index 8958c8769..b30af56b4 100644
--- a/src/modules/text-expand/text-expand.component.ts
+++ b/src/modules/text-expand/text-expand.component.ts
@@ -177,5 +177,4 @@ export class SkyTextExpandComponent implements AfterContentInit {
       adapter.setContainerHeight(container, `${newHeight}px`);
     }, 5);
   }
-
 }
diff --git a/tsconfig.json b/tsconfig.json
index 8fa8cd85b..0c490a562 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -35,8 +35,7 @@
   "exclude": [
     "node_modules",
     "dist",
-    "skyux-spa-visual-tests/node_modules",
-    "skyux-spa-visual-tests/dist"
+    "skyux-spa-visual-tests"
   ],
   "compileOnSave": false,
   "buildOnSave": false,