Core: Fixed more errors