diff --git a/qse/include/qse/cmn/htl.h b/qse/include/qse/cmn/htl.h
index db458f57..801d66d4 100644
--- a/qse/include/qse/cmn/htl.h
+++ b/qse/include/qse/cmn/htl.h
@@ -189,10 +189,10 @@ static QSE_INLINE void qse_htl_setcopier (qse_htl_t* htl, qse_htl_copier_t _copi
 #define qse_htl_getcomper(htl) ((htl)->comper)
 #define qse_htl_getfreeer(htl) ((htl)->freeer)
 
-#define qse_htl_sethasher(htl,_hahser) ((htl)->hasher = _hasher)
-#define qse_htl_setcomper(htl,_comper) ((htl)->comper = _comper)
-#define qse_htl_setfreeer(htl,_freeer) ((htl)->freeer = _freeer)
-#define qse_htl_setcopier(htl,_copier) ((htl)->copier = _copier)
+#define qse_htl_sethasher(htl,_hasher) ((htl)->hasher = (_hasher))
+#define qse_htl_setcomper(htl,_comper) ((htl)->comper = (_comper))
+#define qse_htl_setfreeer(htl,_freeer) ((htl)->freeer = (_freeer))
+#define qse_htl_setcopier(htl,_copier) ((htl)->copier = (_copier))
 #endif
 
 /**
diff --git a/qse/samples/si/log01.c b/qse/samples/si/log01.c
index 8b42c101..322861ea 100644
--- a/qse/samples/si/log01.c
+++ b/qse/samples/si/log01.c
@@ -92,16 +92,13 @@ static void t1 (void)
 			QSE_ASSERT (qse_log_gettarget (log, QSE_NULL) == (QSE_LOG_CONSOLE | QSE_LOG_FILE | QSE_LOG_SYSLOG_REMOTE));
 		}
 
-		QSE_LOG4 (log, QSE_T("test"), QSE_LOG_DEBUG, 
-#if defined(QSE_HAVE_INT128_T)
-			QSE_T("MSG %d %I128x %#0128I128b %l20d >>"), 
-#elif defined(QSE_HAVE_INT64_T)
-			QSE_T("MSG %d %I64x %#064I64b %l20d >>"), 
-#else
-			QSE_T("MSG %d %I32x %#032I32b %l20d >>"), 
-#endif
-			10 * i , q, q, (long)45
-		);
+	#if defined(QSE_HAVE_INT128_T)
+		QSE_LOG4 (log, QSE_T("test"), QSE_LOG_DEBUG, QSE_T("MSG %d %I128x %#0128I128b %l20d >>"), 10 * i , q, q, (long)45);
+	#elif defined(QSE_HAVE_INT64_T)
+		QSE_LOG4 (log, QSE_T("test"), QSE_LOG_DEBUG, QSE_T("MSG %d %I64x %#064I64b %l20d >>"), 10 * i , q, q, (long)45);
+	#else
+		QSE_LOG4 (log, QSE_T("test"), QSE_LOG_DEBUG, QSE_T("MSG %d %I32x %#032I32b %l20d >>"), 10 * i , q, q, (long)45);
+	#endif
 	}
 
 
diff --git a/qse/samples/si/rwl01.c b/qse/samples/si/rwl01.c
index c46eff81..da9cf776 100644
--- a/qse/samples/si/rwl01.c
+++ b/qse/samples/si/rwl01.c
@@ -28,7 +28,7 @@ static int stop_req = 0;
 	qse_mtx_unlock (mtx); \
 } while(0)
 
-static int thr_exec (qse_thr_t* thr)
+static int thr_exec (qse_thr_t* thr, void* ctx)
 {
 	thr_xtn_t* xtn = qse_thr_getxtn(thr);
 
diff --git a/qse/samples/si/thr01.c b/qse/samples/si/thr01.c
index d6fb1da7..889e1269 100644
--- a/qse/samples/si/thr01.c
+++ b/qse/samples/si/thr01.c
@@ -20,7 +20,7 @@ struct thr_xtn_t
 };
 typedef struct thr_xtn_t thr_xtn_t;
 
-static int thr_func (qse_thr_t* thr)
+static int thr_func (qse_thr_t* thr, void* ctx)
 {
 	int i = 0;
 	thr_xtn_t* xtn = qse_thr_getxtn(thr);