Re-patching a few things lost in a previous change to MGC

Zach Marshallrequested to merge
zmarshal/athena:MGC_RePatch into main

A few changes were lost in !75476 (merged) unintentionally. Adding them back in here. Thanks @ljerala for pointing out the problem.

Merge request reports