Correcting some stuffs