Package update & fixes