[Do not merge] Fixes to idler (broken when making it an extension)