Correcting some stuff