Fix some little issue