Catastrophic Inversion: Additional BugFixes

Added a couple more fixes to ensure a smoother transition between matches.