Fixed 3 small issue