Made minor fixes