Fixes

Security Demo & VS Template fixes