Bug fixes batch 3