diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/CameraPanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/CameraPanel.java
index 78fe7a3..fd703ca 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/CameraPanel.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/CameraPanel.java
@@ -135,7 +135,7 @@ private void createEventHandlers() {
                 // live mode
                 btnLiveMode_.registerListener(e -> {
                     closeLiveModeWindow();
-                    final CameraBase camera = model_.devices().getDevice("ImagingCamera");
+                    final CameraBase camera = model_.devices().getFirstImagingCamera();
                     if (camera != null) {
                         try {
                             model_.studio().core().setCameraDevice(camera.getDeviceName());
@@ -147,6 +147,7 @@ private void createEventHandlers() {
                         isLivePressed = true;
                         model_.studio().live().setLiveModeOn(true);
                     } else {
+                        // TODO: use correct name for camera, ImagingCamera1, etc
                         model_.studio().logs().showError(
                                 "No device for \"ImagingCamera\" set in the device adapter.");
                     }
diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/PiezoCalibrationPanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/PiezoCalibrationPanel.java
index 97f3a26..eccb386 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/PiezoCalibrationPanel.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/PiezoCalibrationPanel.java
@@ -163,7 +163,10 @@ private void createEventHandlers() {
                     // FIXME: update channelOffset
                     // was: channelOffset = ASIdiSPIM.getFrame().getAcquisitionPanel().getChannelOffset();
                     final double newOffset = piezoPosition - rate * scannerPosition - channelOffset;
-                    txtOffset_.setText(String.format("%.3f μm", newOffset));
+                    //txtOffset_.setText(String.format("%.3f μm", newOffset));
+                    lblOffsetValue_.setText(String.format("%.3f μm", newOffset));
+                    model_.acquisitions().settingsBuilder()
+                          .sliceCalibrationBuilder(pathNum_).sliceOffset(newOffset);
                     model_.studio().logs().logMessage("updated offset for view " + pathNum_ + "; new value is " +
                             newOffset + " (with channel offset of " + channelOffset + ")");
                 }
diff --git a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/SetupPanel.java b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/SetupPanel.java
index 462bcbd..86a9f03 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/SetupPanel.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/gui/tabs/setup/SetupPanel.java
@@ -55,8 +55,8 @@ public SetupPanel(final LightSheetManager model, final int pathNum) {
         cameraPanel_ = new CameraPanel(model_);
 
         // TODO: add joystick panel back in
-        //leftPanel_.add(joystickPanel_, "growx, wrap");
         leftPanel_.add(excitationPanel_, "growx, wrap");
+        //leftPanel_.add(joystickPanel_, "growx, wrap");
         if (model_.devices().getDeviceAdapter().getMicroscopeGeometry() == GeometryType.SCAPE) {
             singleAxisPanel_ = new SingleAxisPanel(model_);
             leftPanel_.add(singleAxisPanel_, "growx, wrap");
diff --git a/src/main/java/org/micromanager/lightsheetmanager/model/positions/PositionUpdater.java b/src/main/java/org/micromanager/lightsheetmanager/model/positions/PositionUpdater.java
index 714c8c6..9caa3e8 100644
--- a/src/main/java/org/micromanager/lightsheetmanager/model/positions/PositionUpdater.java
+++ b/src/main/java/org/micromanager/lightsheetmanager/model/positions/PositionUpdater.java
@@ -42,7 +42,7 @@ public void setup() {
    }
 
    private void createPollingTask() {
-      worker_ = new SwingWorker<Void, Void>() {
+      worker_ = new SwingWorker<>() {
          @Override
          protected Void doInBackground() {
             while (isPolling_.get()) {