Fix some little bugs.