diff --git a/fileserver/fileserver.go b/fileserver/fileserver.go
index dbc9bf5..7c2bac2 100644
--- a/fileserver/fileserver.go
+++ b/fileserver/fileserver.go
@@ -390,7 +390,7 @@ func main() {
 	}
 	// When logFile is "-", use default output (StdOut)
 
-	log.SetFlags(log.Ldate | log.Ltime | log.Lshortfile)
+	log.SetFlags(log.Ldate | log.Ltime)
 
 	if absLogFile != "" {
 		errorLogFile := filepath.Join(filepath.Dir(absLogFile), "fileserver-error.log")
diff --git a/fileserver/sync_api.go b/fileserver/sync_api.go
index 6da5f0b..28aa966 100644
--- a/fileserver/sync_api.go
+++ b/fileserver/sync_api.go
@@ -747,12 +747,12 @@ func getBlockInfo(rsp http.ResponseWriter, r *http.Request) *appError {
 
 	blockLen := fmt.Sprintf("%d", blockSize)
 	rsp.Header().Set("Content-Length", blockLen)
-	rsp.WriteHeader(http.StatusOK)
 	if err := blockmgr.Read(storeID, blockID, rsp); err != nil {
 		return &appError{err, "", http.StatusInternalServerError}
 	}
 
 	sendStatisticMsg(storeID, user, "sync-file-download", uint64(blockSize))
+	rsp.WriteHeader(http.StatusOK)
 	return nil
 }