Fix even more logic errors.