Fixed VS bugs.