Fixed a few issues with visual studio