Fixes for generic make target (more needed).