Fix faults that slipped through that merge