Fix custom grains and pillars