Number wang and sanitizer fixes.