I have made Minerva as a GMNPC so that when she is needed, much like Potter's post, she can be brought in. Not sure what Hagrid is needed for or even if he's still at the school as that's not been decided yet. But I'll let the post stand as is.