fix 2 small issue