Fix up various build issues
Fix make distcheck
2.30.3