GRIM: Add override to a few missed classes