diff --git a/uppsrc/Core/Profile.h b/uppsrc/Core/Profile.h
index 1ef93faca..2a40f79f7 100644
--- a/uppsrc/Core/Profile.h
+++ b/uppsrc/Core/Profile.h
@@ -54,8 +54,8 @@ private:
 };
 
 #define RTIMING(x) \
-	static TimingInspector COMBINE(sTmStat, __LINE__)(x); \
-	TimingInspector::Routine COMBINE(sTmStatR, __LINE__)(COMBINE(sTmStat, __LINE__));
+	static UPP::TimingInspector COMBINE(sTmStat, __LINE__)(x); \
+	UPP::TimingInspector::Routine COMBINE(sTmStatR, __LINE__)(COMBINE(sTmStat, __LINE__));
 
 #define RACTIVATE_TIMING()    TimingInspector::Activate(true);
 #define RDEACTIVATE_TIMING()  TimingInspector::Activate(false);
diff --git a/uppsrc/Core/Util.cpp b/uppsrc/Core/Util.cpp
index dd86bd64d..65fa6c080 100644
--- a/uppsrc/Core/Util.cpp
+++ b/uppsrc/Core/Util.cpp
@@ -430,6 +430,7 @@ String TextSettings::Get(const char *group, const char *key) const
 // --------------------------------------------------------------
 
 String timeFormat(double s) {
+	if(s < 0.000001) return Sprintf("%5.2f ns", s * 1.0e9);
 	if(s < 0.001) return Sprintf("%5.2f us", s * 1.0e6);
 	if(s < 1) return Sprintf("%5.2f ms", s * 1.0e3);
 	return Sprintf("%5.2f s ", s);