Fix SMOKE errors