Updated minor stuffs