Fixing wait timeout spinner to be more sane