Various small updates that improve linking