Task #0066: Minor make system fixes.