Corrected small issues