More package tweaks