Repair some broken functionality after previous commit