Updates

Visual Studio 2012 / Windows 8 fixes