diff --git a/config/devices.properties b/config/devices.properties
index b39020c..d044d00 100644
--- a/config/devices.properties
+++ b/config/devices.properties
@@ -1,7 +1,7 @@
 diode=ch.psi.pshell.epics.ChannelDouble|X10SA-ES-KBOX_K:READOUT 6|Read||true
 $shutter=ch.psi.pshell.epics.ChannelInteger|X10SA-ES-PH1:SET|||true
-omega=ch.psi.pshell.epics.Positionable|X10SA-ES-DF1:OMEGA-VAL X10SA-ES-DF1:OMEGA-RBV|||true
-x=ch.psi.pshell.epics.Positionable|X10SA-ES-DF1:GMX-VAL X10SA-ES-DF1:GMX-RBV|||true
+omega=ch.psi.pshell.epics.Positioner|X10SA-ES-DF1:OMEGA-VAL X10SA-ES-DF1:OMEGA-RBV|||true
+x=ch.psi.pshell.epics.Positioner|X10SA-ES-DF1:GMX-VAL X10SA-ES-DF1:GMX-RBV|||true
 cy=ch.psi.pshell.epics.Motor|X10SA-ES-DFS:TRY1|||true
 cz=ch.psi.pshell.epics.Motor|X10SA-ES-DFS:TRZ1|||true
 apertureX=ch.psi.pshell.epics.Motor|X10SA-ES-MIC:TRX1|||true
@@ -12,7 +12,7 @@ beamstopZ=ch.psi.pshell.epics.Motor|X10SA-ES-BS:TRZ1|||true
 collimatorX=ch.psi.pshell.epics.Motor|X10SA-ES-MIC:TRX2|||true
 collimatorY=ch.psi.pshell.epics.Motor|X10SA-ES-MIC:TRY2|||true
 scintillatorY=ch.psi.pshell.epics.Motor|X10SA-ES-MIC:TRY3|||true
-scintillatorZ=ch.psi.pshell.epics.Positionable|X10SA-ES-SCINTI:SET-FOCUS X10SA-ES-SCINTI:GET-FOCUS|||true
+scintillatorZ=ch.psi.pshell.epics.Positioner|X10SA-ES-SCINTI:SET-FOCUS X10SA-ES-SCINTI:GET-FOCUS|||true
 detectorZ=ch.psi.pshell.epics.Motor|X10SA-ES-D:TRZ1|||true
 detectorY=ch.psi.pshell.epics.Motor|X10SA-ES-D:TRY1|||true
 #apertureTable=ch.psi.pshell.device.MotorGroupBase|apertureX apertureY|||
diff --git a/config/plugins.properties b/config/plugins.properties
index a748d3f..aa7b55f 100644
--- a/config/plugins.properties
+++ b/config/plugins.properties
@@ -1 +1 @@
-./home/plugins/Microscope.java=enabled
+/sls/X10SA/data/x10saop/pshell/home/plugins/Microscope.java=enabled