Changes for VS10.