Add missing override keywords in the new PunchThroughG4 classes and fix some other issues.
PunchThroughG4
Let's keep 24.0 in sync and fix it also here.
/cc @ssnyder @tsulaia @jchapman @mumohdso