Fixed minor errors 2