improve handling of non-constrained executables
3 files changed