Fixes to the execution policy