Fixed Packaging Issues