Unfrozen fix + package updates

rebased package fixes onto unfrozen-fix branch.