Fix calls to exec