Fix some silly issue