Updates

7920/7922

Fixed

  • Fixed earlier reported issues