Fixes to idle