Quick fixes for compile errors (probably from merge issue bugs)
Conflicts:
	Core/CLI/src/cli_smem.cpp
	Tests/UnitTests/src/smemmathtest.cpp