Fix user bug and mapping bug.