Makefile/configure: small fixes.