Fix Exec relationships, fix passed parameters