Minor fixes/shuffling.