Fixes for a couple of make targets.