Fix some Makefile-related errors.