Refixed packaging issues