Corrected some minor stuffs