Fixing a few things.
Visual studio compile works.