bug fixes batch 3