More package setup tweaks