More SM_PATH changes