Packaging fixes. Makefile fixes.