diff --git a/frame/base/bli_cntx.c b/frame/base/bli_cntx.c
index db2d73953..981b01c3e 100644
--- a/frame/base/bli_cntx.c
+++ b/frame/base/bli_cntx.c
@@ -988,7 +988,7 @@ void bli_cntx_set_thrloop_from_env
 			);
 		}
 	}
-	else // if ( l3_op == BLIS_TRSM )
+	else // if ( l3_op == BLIS_GEMM || l3_op == BLIS_HERK )
 	{
 		bli_cntx_set_thrloop
 		(
diff --git a/sandbox/ref99/vars/blx_gemm_ker_var2.c b/sandbox/ref99/vars/blx_gemm_ker_var2.c
index bfc248d12..1942f987c 100644
--- a/sandbox/ref99/vars/blx_gemm_ker_var2.c
+++ b/sandbox/ref99/vars/blx_gemm_ker_var2.c
@@ -283,11 +283,11 @@ void PASTECH2(blx_,ch,varname) \
 			m_cur = ( bli_is_not_edge_f( i, m_iter, m_left ) ? MR : m_left ); \
 \
 			/* Compute the addresses of the next panels of A and B. */ \
-			a2 = gemm_get_next_a_micropanel( caucus, a1, rstep_a ); \
+			a2 = bli_gemm_get_next_a_upanel( caucus, a1, rstep_a ); \
 			if ( bli_is_last_iter( i, m_iter, ir_thread_id, ir_num_threads ) ) \
 			{ \
 				a2 = a_cast; \
-				b2 = gemm_get_next_b_micropanel( thread, b1, cstep_b ); \
+				b2 = bli_gemm_get_next_b_upanel( thread, b1, cstep_b ); \
 				if ( bli_is_last_iter( j, n_iter, jr_thread_id, jr_num_threads ) ) \
 					b2 = b_cast; \
 			} \