Correcting some minor issues