Fix things missing from previous commits