Slightly improve Makefile and packaging