VS build updates and change to enum type.