diff --git a/andorApp/src/andorCCD.cpp b/andorApp/src/andorCCD.cpp
index abecd28..f7cb4e4 100755
--- a/andorApp/src/andorCCD.cpp
+++ b/andorApp/src/andorCCD.cpp
@@ -1538,7 +1538,6 @@ void AndorCCD::dataTask(void)
   size_t dims[2];
   int nDims = 2;
   int i;
-  epicsTimeStamp startTime;
   NDArray *pArray;
   int autoSave;
   int readOutMode;
@@ -1618,7 +1617,6 @@ void AndorCCD::dataTask(void)
           setIntegerParam(ADNumImagesCounter, numImagesCounter);
           // If array callbacks are enabled then read data into NDArray, do callbacks
           if (arrayCallbacks) {
-            epicsTimeGetCurrent(&startTime);
             // Allocate an NDArray
             dims[0] = sizeX;
             dims[1] = sizeY;
@@ -1649,8 +1647,7 @@ void AndorCCD::dataTask(void)
             }
             /* Put the frame number and time stamp into the buffer */
             pArray->uniqueId = imageCounter;
-            pArray->timeStamp = startTime.secPastEpoch + startTime.nsec / 1.e9;
-            updateTimeStamp(&pArray->epicsTS);
+            updateTimeStamps(pArray);
             /* Get any attributes that have been defined for this driver */        
             this->getAttributes(pArray->pAttributeList);
             /* Call the NDArray callback */
diff --git a/andorSupport/Makefile b/andorSupport/Makefile
index 7a8fe0d..3f9a91b 100755
--- a/andorSupport/Makefile
+++ b/andorSupport/Makefile
@@ -21,20 +21,21 @@ else ifeq (windows-x64, $(findstring windows-x64, $(T_A)))
 LIB_INSTALLS_WIN32    += ../os/windows-x64/atmcd64m.lib
 LIB_INSTALLS_WIN32    += ../os/windows-x64/ShamrockCIFm.lib
 
-else ifeq (linux-x86_64, $(findstring linux-x86_64, $(T_A)))
-LIB_INSTALLS_Linux += ../os/linux-x86_64/libandor.so.2
-LIB_INSTALLS_Linux += ../os/linux-x86_64/libandor.so
-LIB_INSTALLS_Linux += ../os/linux-x86_64/libshamrockcif.so.2
-LIB_INSTALLS_Linux += ../os/linux-x86_64/libshamrockcif.so
+else ifeq ($(OS_CLASS), Linux)
+  ifeq ($(ARCH_CLASS), x86_64)
+  LIB_INSTALLS_Linux += ../os/linux-x86_64/libandor.so.2
+  LIB_INSTALLS_Linux += ../os/linux-x86_64/libandor.so
+  LIB_INSTALLS_Linux += ../os/linux-x86_64/libshamrockcif.so.2
+  LIB_INSTALLS_Linux += ../os/linux-x86_64/libshamrockcif.so
 
-else ifeq (linux-x86, $(findstring linux-x86, $(T_A)))
-LIB_INSTALLS_Linux += ../os/linux-x86/libandor.so.2
-LIB_INSTALLS_Linux += ../os/linux-x86/libandor.so
-LIB_INSTALLS_Linux += ../os/linux-x86/libshamrockcif.so.2
-LIB_INSTALLS_Linux += ../os/linux-x86/libshamrockcif.so
+  else ifeq ($(ARCH_CLASS), x86)
+  LIB_INSTALLS_Linux += ../os/linux-x86/libandor.so.2
+  LIB_INSTALLS_Linux += ../os/linux-x86/libandor.so
+  LIB_INSTALLS_Linux += ../os/linux-x86/libshamrockcif.so.2
+  LIB_INSTALLS_Linux += ../os/linux-x86/libshamrockcif.so
 
+  endif
 endif
-
 #=============================
 
 include $(TOP)/configure/RULES