Minor swaps and fixes during demo