Some shuffling, and ensuring things work properly.