Fixes for hash packing