diff --git a/js/model/CircuitConstructionKitModel.js b/js/model/CircuitConstructionKitModel.js
index 58cca2bb..e40fc073 100644
--- a/js/model/CircuitConstructionKitModel.js
+++ b/js/model/CircuitConstructionKitModel.js
@@ -100,7 +100,8 @@ class CircuitConstructionKitModel {
 
     // True if the simulation is playing, controlled by the TimeControlNode
     this.isPlayingProperty = new BooleanProperty( true, {
-      tandem: tandem.createTandem( 'isPlayingProperty' )
+      tandem: tandem.createTandem( 'isPlayingProperty' ),
+      phetioFeatured: true
     } );
 
     // @public {Property.<InteractionMode>} - whether the user is in the CircuitConstructionKitModel.InteractionMode.EXPLORE or CircuitConstructionKitModel.InteractionMode.TEST mode
@@ -135,7 +136,7 @@ class CircuitConstructionKitModel {
           this.isValueDepictionEnabledProperty.value = false;
         }
       };
-       this.circuit.vertexGroup.elementCreatedEmitter.addListener( pause );
+      this.circuit.vertexGroup.elementCreatedEmitter.addListener( pause );
       this.circuit.vertexGroup.elementDisposedEmitter.addListener( pause );
       this.circuit.componentEditedEmitter.addListener( pause );
       this.circuit.circuitElements.lengthProperty.link( pause );
diff --git a/js/model/VoltageSource.js b/js/model/VoltageSource.js
index d81c42af..0ef94ee3 100644
--- a/js/model/VoltageSource.js
+++ b/js/model/VoltageSource.js
@@ -31,7 +31,7 @@ class VoltageSource extends FixedCircuitElement {
       isFlammable: true,
       numberOfDecimalPlaces: 1,
       voltagePropertyOptions: {
-        tandem: tandem.createTandem( 'voltageProperty' )
+        tandem: tandem.createTandem( 'voltageSourceProperty' ) // TODO: Collides with Battery.voltageProperty
       }
     }, options );
     super( startVertex, endVertex, length, tandem, options );
diff --git a/js/view/CCKCScreenView.js b/js/view/CCKCScreenView.js
index 1311de8c..d5f644d8 100644
--- a/js/view/CCKCScreenView.js
+++ b/js/view/CCKCScreenView.js
@@ -290,6 +290,7 @@ class CCKCScreenView extends ScreenView {
     zoomControlPanel.setScaleMagnitude( 0.8 );
 
     const timeControlNode = new TimeControlNode( model.isPlayingProperty, {
+      tandem: tandem.createTandem( 'timeControlNode' ),
       playPauseStepButtonOptions: {
         stepForwardButtonOptions: {
           listener: () => model.stepSingleStep()