Fixes to the execution policy
Merge pull request #2483 from ogail/module

Fixes to the execution policy