diff --git a/uppsrc/Core/heapdbg.cpp b/uppsrc/Core/heapdbg.cpp
index fb40c8350..4b6871794 100644
--- a/uppsrc/Core/heapdbg.cpp
+++ b/uppsrc/Core/heapdbg.cpp
@@ -90,7 +90,11 @@ void *MemoryAlloc(size_t size)
 #endif
 	static dword serial_number = 0;
 	DbgBlkHeader *p = (DbgBlkHeader *)MemoryAlloc_(sizeof(DbgBlkHeader) + size + sizeof(dword));
+#if (defined(TESTLEAKS) || defined(HEAPDBG)) && defined(COMPILER_GCC) && defined(UPP_HEAP)
 	p->serial = sMemDiagInitCount == 0 || s_ignoreleaks ? 0 : ~ ++serial_number ^ (dword)(uintptr_t) p;
+#else
+	p->serial = s_ignoreleaks ? 0 : ~ ++serial_number ^ (dword)(uintptr_t) p;
+#endif
 	p->size = size;
 	if(s_allocbreakpoint && s_allocbreakpoint == serial_number)
 		__BREAK__;
diff --git a/uppsrc/ide/ide.h b/uppsrc/ide/ide.h
index 05803c230..d4b57afb8 100644
--- a/uppsrc/ide/ide.h
+++ b/uppsrc/ide/ide.h
@@ -347,7 +347,7 @@ public:
 	virtual   void   PutConsole(const char *s);
 	virtual   void   PutVerbose(const char *s);
 	virtual   void   PutLinking();
-	virtual   void   PutLinkingEnd(bool ok); 
+	virtual   void   PutLinkingEnd(bool ok);
 
 	virtual   const Workspace& IdeWorkspace() const;
 	virtual   bool             IdeIsBuilding() const;