Fix minor build bugs.  'make distcheck' still broken.