401k Automatic Spillover to Catch-Up Elections

We are trying to use the PeopleSoft-delivered functionality to trigger automatically catch-up elections once the $24,500 limit is reached. Two questions:

(1) We are finding that the system automatically generates company match on the catch-up "spillover" that's automatically triggered. Has anyone found a way to turn off company match on the automatically generated catch-up piece without doing a separate benefit plan/deduction code?

(2) Second question: is there a way to override the spillover method if individuals don't want the mandatory Roth catch-up? One way is would be to track when the spillover kicks in (which pay period) and do deduction overrides