[Core] Fix VS Build issues
[Core] Added code notes back into source