Fix small bags at deployment