fix some little issues