More base_link changes.