Improved packing heuristics