Some more tweaks from ENGINE code.