Minor changes to CEF execution.