WIN32 cleanup + 2 zero vector fixes