[IG] Cellar bugfixes