Fixed some small issue