Fixes to run on proof
Fixes to run on proof