[cvs-nhc98] Forgot to add these in previous commit.