diff --git a/logicaldoc-core/src/main/java/com/logicaldoc/core/document/DocumentManagerImpl.java b/logicaldoc-core/src/main/java/com/logicaldoc/core/document/DocumentManagerImpl.java
index 53180d410..6e03de0be 100644
--- a/logicaldoc-core/src/main/java/com/logicaldoc/core/document/DocumentManagerImpl.java
+++ b/logicaldoc-core/src/main/java/com/logicaldoc/core/document/DocumentManagerImpl.java
@@ -209,6 +209,7 @@ public void checkin(long docId, File file, String filename, boolean release, Abs
 			throw new IllegalArgumentException("File name is mandatory");
 
 		transaction.setEvent(DocumentEvent.CHECKEDIN.toString());
+		transaction.setFile(file.getAbsolutePath());
 
 		/*
 		 * Better to synchronize this block because under high multi-threading
@@ -349,7 +350,7 @@ public void checkin(long docId, InputStream content, String filename, boolean re
 		validateTransaction(transaction);
 
 		// Write content to temporary file, then delete it
-		File tmp = FileUtil.createTempFile("checkin", "");
+		File tmp = FileUtil.createTempFile("checkin", "." + FileUtil.getExtension(filename));
 		try {
 			FileUtil.writeFile(content, tmp.getPath());
 			checkin(docId, tmp, filename, release, docVO, transaction);
@@ -458,7 +459,8 @@ public String parseDocument(Document doc, String fileVersion) throws ParseExcept
 
 			TenantDAO tDao = (TenantDAO) Context.get().getBean(TenantDAO.class);
 			try {
-				content = parser.parse(storer.getStream(doc.getId(), resource), new ParseParameters(doc, doc.getFileName(), fileVersion, null, locale, tDao.findById(doc.getTenantId()).getName()));
+				content = parser.parse(storer.getStream(doc.getId(), resource), new ParseParameters(doc,
+						doc.getFileName(), fileVersion, null, locale, tDao.findById(doc.getTenantId()).getName()));
 			} catch (Exception e) {
 				log.error("Cannot parse document {}", doc, e);
 				if (e instanceof ParseException)
diff --git a/logicaldoc-webapp/src/main/java/com/logicaldoc/web/data/EnvironmentDataServlet.java b/logicaldoc-webapp/src/main/java/com/logicaldoc/web/data/EnvironmentDataServlet.java
index dfa132960..0157ff145 100644
--- a/logicaldoc-webapp/src/main/java/com/logicaldoc/web/data/EnvironmentDataServlet.java
+++ b/logicaldoc-webapp/src/main/java/com/logicaldoc/web/data/EnvironmentDataServlet.java
@@ -51,7 +51,7 @@ protected void service(HttpServletRequest request, HttpServletResponse response,
 			writer.print(ENTRY_CLOSE);
 		}
 
-		DocumentDAO dao = (DocumentDAO) Context.get().getBean("DocumentDAO");
+		DocumentDAO dao = (DocumentDAO) Context.get().getBean(DocumentDAO.class);
 		Map<String, String> meta = dao.getDatabaseMetadata();
 		for (Map.Entry<String, String> entry : meta.entrySet()) {
 			writer.print(ENTRY_SCOPE_DATABASE_SCOPE);