fixing execution related issues