Distcheck fixes