SM_PATH fixes