Patched a few more instances of user data.