Core: Fixed minor errors