Making minor fixes