Use override in more classes in core/