Fixes for execution paths