Fix package from Makefile and tags