Fixing execution problems