2 fixes for "make dist"

@sayantansur @jithinjosepkl Please review.  These two commits are necessary to fix "make dist", as noted in #219.