Fixes for pause and idle timeouts