Correcting some types