Makepack improvements