Updated/fixed package generation