diff --git a/src/cmd/ksh93/include/ulimit.h b/src/cmd/ksh93/include/ulimit.h
index a0e63304b887..5d05c673a654 100644
--- a/src/cmd/ksh93/include/ulimit.h
+++ b/src/cmd/ksh93/include/ulimit.h
@@ -157,7 +157,7 @@
 
 typedef struct Limit_s
 {
-	const char	name[16];
+	const char*	name;
 	const char*	description;
 	int		index;
 	const char*	conf;
diff --git a/src/cmd/ksh93/sh/init.c b/src/cmd/ksh93/sh/init.c
index 3a0271b928e3..f7aa10966cb0 100644
--- a/src/cmd/ksh93/sh/init.c
+++ b/src/cmd/ksh93/sh/init.c
@@ -161,7 +161,7 @@ struct match
 	char		*val;
 	char		*rval[2];
 	regoff_t	*match;
-	char		node[NV_MINSZ+sizeof(char*)];
+	char		node[NV_MINSZ+sizeof(char*)+sizeof(Dtlink_t)];
 	regoff_t	first;
 	int		vsize;
 	int		nmatch;
@@ -721,7 +721,7 @@ static int hasgetdisc(register Namfun_t *fp)
 void sh_setmatch(Shell_t *shp,const char *v, int vsize, int nmatch, regoff_t match[],int index)
 {
 	struct match	*mp = &ip->SH_MATCH_init;
-	Namval_t	*np = nv_namptr(mp->node,0); 
+	Namval_t	*np = (Namval_t*)(&(mp->node[0]));
 	register int	i,n,x;
 	unsigned int	savesub = shp->subshell;
 	Namarr_t	*ap = nv_arrayptr(SH_MATCHNOD);