Changes to allow VC++ express compilation