More distcheck fixes