Correcting some fixes