Fixes to idler (broken when making it an extention)