Distcheck fixes

A couple of fixes to get `make distcheck` working for me again. Note that 8b9d5dd fixes #8 for me.