fix some little bugs.