Fix make dist

Two small fixes which result in 'make dist' working again (but not yet distcheck).