Fixed and updated references for use in VS2012.