Queue and timer fixes.