More package hacks