Updates for Sanitize runmode. Fixes for engines.