Move things around to reduce general crashiness