Fixes for "make distcheck"