Update packaging a bit