ZakarY2HM6f Bug Fixes