Little adjustments, preparing for linked use.