Core: Fixed more errors.