Minor rearrangements all around