[ZoG] Small fixes