Shuffle some more logs around to more appropriate places.