Fixes for execution