diff --git a/package.json b/package.json
index 5849735..53c124a 100644
--- a/package.json
+++ b/package.json
@@ -50,21 +50,21 @@
     "ts-disposables": "2.2.3"
   },
   "peerDependencies": {
-    "@angular/core": ">=6.0.0 <7.0.0",
-    "@angular/forms": ">=6.0.0 < 7.0.0",
-    "@angular/platform-browser": ">=6.0.0 <7.0.0",
+    "@angular/core": ">=6.0.0 <8.0.0",
+    "@angular/forms": ">=6.0.0 < 8.0.0",
+    "@angular/platform-browser": ">=6.0.0 <8.0.0",
     "rxjs": ">=6.0.0 <7.0.0"
   },
   "devDependencies": {
-    "@angular/animations": "6.0.7",
-    "@angular/common": "6.0.7",
-    "@angular/compiler": "6.0.7",
-    "@angular/compiler-cli": "6.0.7",
-    "@angular/core": "6.0.7",
-    "@angular/forms": "6.0.7",
-    "@angular/platform-browser": "6.0.7",
-    "@angular/platform-browser-dynamic": "6.0.7",
-    "@angular/platform-server": "6.0.7",
+    "@angular/animations": "7.1.1",
+    "@angular/common": "7.1.1",
+    "@angular/compiler": "7.1.1",
+    "@angular/compiler-cli": "7.1.1",
+    "@angular/core": "7.1.1",
+    "@angular/forms": "7.1.1",
+    "@angular/platform-browser": "7.1.1",
+    "@angular/platform-browser-dynamic": "7.1.1",
+    "@angular/platform-server": "7.1.1",
     "@types/backbone": "1.3.42",
     "@types/codemirror": "0.0.64",
     "@types/jasmine": "2.5.36",
@@ -80,7 +80,7 @@
     "gulp": "3.9.1",
     "gulp-inline-ng2-template": "5.0.1",
     "jasmine-core": "2.5.2",
-    "jointjs": "2.1.4",
+    "jointjs": "2.2.1",
     "jquery": "3.1.1",
     "jshint": "2.6.3",
     "karma": "1.5.0",
@@ -97,13 +97,13 @@
     "rollup-plugin-commonjs": "9.1.3",
     "rollup-plugin-node-resolve": "3.3.0",
     "rollup-plugin-sourcemaps": "0.4.2",
-    "rxjs": "6.2.1",
+    "rxjs": "6.3.3",
     "shelljs": "0.8.1",
     "standard-version": "4.0.0",
     "systemjs": "0.21.4",
     "ts-disposables": "2.2.3",
     "tslint": "5.10.0",
-    "typescript": "2.7.2",
+    "typescript": "3.1.4",
     "uglify-js": "3.3.23",
     "zone.js": "0.8.26",
     "rxjs-compat": "^6.3.0"
diff --git a/src/lib/editor/editor.component.ts b/src/lib/editor/editor.component.ts
index e8ff2c7..5c2caad 100644
--- a/src/lib/editor/editor.component.ts
+++ b/src/lib/editor/editor.component.ts
@@ -282,8 +282,6 @@ export class EditorComponent implements OnInit, OnDestroy {
   }
 
   ngOnInit() {
-    console.log('Initializing my component');
-
     this.initGraph();
 
     this.initPaper();
@@ -650,7 +648,7 @@ export class EditorComponent implements OnInit, OnDestroy {
   }
 
   handleDragFromPalette(dnDEvent: Flo.DnDEvent) {
-    console.log('Dragging from palette');
+    console.debug('Dragging from palette');
     if (dnDEvent.view && !this.readOnlyCanvas) {
       let location = this.paper.snapToGrid({x: dnDEvent.event.clientX, y: dnDEvent.event.clientY});
       this.handleNodeDragging(dnDEvent.view,  this.getTargetViewFromEvent(dnDEvent.event, location.x, location.y, [dnDEvent.view]), location.x, location.y, Constants.PALETTE_CONTEXT);
@@ -923,7 +921,7 @@ export class EditorComponent implements OnInit, OnDestroy {
    * then update the view based on that new information.
    */
   updateGraphRepresentation(): Promise<any> {
-    console.log(`Updating graph to represent '${this._dslText}'`);
+    console.debug(`Updating graph to represent '${this._dslText}'`);
     if (this.metamodel && this.metamodel.textToGraph) {
       return this.metamodel.textToGraph(this.editorContext, this._dslText).then(() => {
         this.textToGraphConversionCompleted.next();
@@ -1138,7 +1136,7 @@ export class EditorComponent implements OnInit, OnDestroy {
     });
 
     this.paper.on('dragging-node-over-canvas', (dndEvent: Flo.DnDEvent) => {
-      console.log(`Canvas DnD type = ${dndEvent.type}`);
+      console.debug(`Canvas DnD type = ${dndEvent.type}`);
       let location = this.paper.snapToGrid({x: dndEvent.event.clientX, y: dndEvent.event.clientY});
       switch (dndEvent.type) {
         case Flo.DnDEventType.DRAG:
diff --git a/src/lib/palette/palette.component.ts b/src/lib/palette/palette.component.ts
index d4c8346..f8f30c5 100644
--- a/src/lib/palette/palette.component.ts
+++ b/src/lib/palette/palette.component.ts
@@ -98,7 +98,7 @@ export class Palette implements OnInit, OnDestroy, OnChanges {
 
   @Input()
   set paletteSize(size: number) {
-    console.log('Palette Size: ' + size);
+    console.debug('Palette Size: ' + size);
     if (this._paletteSize !== size) {
       this._paletteSize = size;
       this.rebuildPalette();
@@ -237,7 +237,7 @@ export class Palette implements OnInit, OnDestroy, OnChanges {
     let groupAdded: Set<string> = new Set<string>();
 
     let parentWidth: number = this._paletteSize;
-    console.log(`Parent Width: ${parentWidth}`);
+    console.debug(`Parent Width: ${parentWidth}`);
 
     // The field closedGroups tells us which should not be shown
     // Work out the list of active groups/nodes based on the filter text
@@ -342,7 +342,7 @@ export class Palette implements OnInit, OnDestroy, OnChanges {
     });
     this.palette.setDimensions(parentWidth, ypos);
     this.paletteReady.emit(true);
-    console.log('buildPalette took ' + (new Date().getTime() - startTime) + 'ms');
+    console.debug('buildPalette took ' + (new Date().getTime() - startTime) + 'ms');
   }
 
   rebuildPalette() {
@@ -472,7 +472,7 @@ export class Palette implements OnInit, OnDestroy, OnChanges {
   private handleDrag(event: any) {
     // TODO offsetX/Y not on firefox
     // console.debug("tracking move: x="+event.pageX+",y="+event.pageY);
-    // console.log('Element = ' + (this.clickedElement ? this.clickedElement.attr('metadata/name'): 'null'));
+    // console.debug('Element = ' + (this.clickedElement ? this.clickedElement.attr('metadata/name'): 'null'));
     if (this.clickedElement && this.clickedElement.attr('metadata')) {
       if (!this.viewBeingDragged) {
 
diff --git a/tsconfig-build.json b/tsconfig-build.json
index 87dcb44..3832b69 100644
--- a/tsconfig-build.json
+++ b/tsconfig-build.json
@@ -37,7 +37,6 @@
   "angularCompilerOptions": {
     "enableResourceInlining": false,
     "skipTemplateCodegen": true,
-    "annotateForClosureCompiler": true,
     "strictMetadataEmit": true,
     "flatModuleOutFile": "./spring-flo.js",
     "flatModuleId": "spring-flo"