Fix grunt, fix package