Correct small issues