Turning off minimize jar for now, it's stripping some code we need. Adding check to avoid running insertExtra when no extra is there.