Fixes due to changes to exec. conf.