diff --git a/auth_token/server/AuthTokenSvc/Makefile.am b/auth_token/server/AuthTokenSvc/Makefile.am
index 93dea32c..00f3f05e 100644
--- a/auth_token/server/AuthTokenSvc/Makefile.am
+++ b/auth_token/server/AuthTokenSvc/Makefile.am
@@ -69,11 +69,17 @@ BUILDDIR = build
 
 WEBAPP = $(WEBAPP_NAME).$(WEBAPP_EXT)
 
-AUTHTOKEN_FILES = -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/AuthToken.class \
-		-C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/IdenTokenConfig.class \
-		-C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/IdentityToken.class \
-		-C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/CasaIdentityToken.class \
-		-C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/Base64Coder.class
+#AUTHTOKEN_FILES = -C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/AuthToken.class \
+#		-C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/AuthToken$SAXHandler.cless \
+#		-C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/AuthTokenConfig.class \
+#		-C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/AuthTokenConfig$SAXHandler.class \
+#		-C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/IdenTokenConfig.class \
+#		-C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/IdenTokenConfig$SAXHandler.class \
+#		-C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/IdentityToken.class \
+#		-C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/CasaIdentityToken.class \
+#		-C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/CasaIdentityToken$SAXHandler.class \
+#		-C $(BUILDDIR)/webapp/WEB-INF/classes com/novell/casa/authtoksvc/Base64Coder.class
+AUTHTOKEN_FILES = -C $(BUILDDIR)/webapp/WEB-INF/classes com
 
 CLASSES = $(addprefix $(BUILDDIR)/, $(JAVAFILES:%.java=%.class))
 
diff --git a/auth_token/server/AuthTokenSvc/TODO b/auth_token/server/AuthTokenSvc/TODO
index aa7960b4..7d10724a 100644
--- a/auth_token/server/AuthTokenSvc/TODO
+++ b/auth_token/server/AuthTokenSvc/TODO
@@ -17,4 +17,5 @@ OUTSTANDING ITEMS
 - Create plug-in API for Identity Token Providers.
 - Integrate into CASA build environment.
 - Review Code.
+- Change printfs used for debugging into a suitable mechanism.
  
diff --git a/auth_token/server/AuthTokenSvc/sampleConf/enabled_services/appserver.companyname.com/testService/identoken.settings b/auth_token/server/AuthTokenSvc/sampleConf/enabled_services/appserver.companyname.com/testService/identoken.settings
index 4a293de2..8fa462c4 100644
--- a/auth_token/server/AuthTokenSvc/sampleConf/enabled_services/appserver.companyname.com/testService/identoken.settings
+++ b/auth_token/server/AuthTokenSvc/sampleConf/enabled_services/appserver.companyname.com/testService/identoken.settings
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <settings>
 <EncryptAttributes>false</EncryptAttributes>
-<Attributes>sn,groupMembership,guid</Attributes>
+<Attributes>sn,groupMembership</Attributes>
 </settings>
 
diff --git a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/CasaIdentityToken.java b/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/CasaIdentityToken.java
index 5c799fe2..9de40376 100644
--- a/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/CasaIdentityToken.java
+++ b/auth_token/server/AuthTokenSvc/src/com/novell/casa/authtoksvc/CasaIdentityToken.java
@@ -488,6 +488,17 @@ public class CasaIdentityToken implements IdentityToken
       m_idenTokenConfig = idenTokenConfig;
    }
 
+   /*
+    * Constructor.
+    */
+   public CasaIdentityToken()
+   {
+      // Initialize our members
+      m_token = null;
+      m_attributes = new javax.naming.directory.BasicAttributes();
+      m_idenTokenConfig = null;
+   }
+
    /*
     * Initialize with parameters.
     */