Package tweaks