Setup Package tweaks