User data bug fixes