do some little fix