Add some minor stuffs