Index: /tags/ipp-20110505/ippTools/src/laptool.c
===================================================================
--- /tags/ipp-20110505/ippTools/src/laptool.c	(revision 31478)
+++ /tags/ipp-20110505/ippTools/src/laptool.c	(revision 31479)
@@ -560,5 +560,5 @@
   psMetadata *where = psMetadataAlloc();
   PXOPT_COPY_S64(config->args, where, "-lap_id", "lap_id", "==");
-  PXOPT_COPY_S64(config->args, where, "-exp_id", "exp_id", "==");
+  PXOPT_COPY_S64(config->args, where, "-exp_id", "lapExp.exp_id", "==");
   
   psString query = pxDataGet("laptool_exposures.sql");
Index: /tags/ipp-20110505/ippTools/src/stacktool.c
===================================================================
--- /tags/ipp-20110505/ippTools/src/stacktool.c	(revision 31478)
+++ /tags/ipp-20110505/ippTools/src/stacktool.c	(revision 31479)
@@ -508,4 +508,7 @@
           association->sass_id = sass_id;
         }
+	else {
+	  sass_id = association->sass_id;
+	}
         // Insert the map entry for this row.
         stackAssociationMapRow *maprow = stackAssociationMapRowAlloc(sass_id,stack_id);