Final misc touches.