Corrected minor fixes