Fixed various small issue