Fixed cpputil for windows