Fixed C2536 errors