Makes VS runnable.
Fixes minor issues so that we can debug in Mac.