[ZoG] Ur Some fixes