Small additional fixes to unpacking section.