Correcting some issues