Core/SmartScripts: Some Corrections to last commit